From 8387e129a2fa9dc449defcc73280b93c360c0353 Mon Sep 17 00:00:00 2001 From: "cl349@firebug.cl.cam.ac.uk" Date: Tue, 31 May 2005 17:13:05 +0000 Subject: [PATCH] bitkeeper revision 1.1618 (429c9b21TCCZatsEzYuIU4HRcrJtyA) XendDomain.py: Allow migration to localhost. g/c XendDomain.domain_exists(). Signed-off-by: Christian Limpach --- tools/python/xen/xend/XendDomain.py | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/tools/python/xen/xend/XendDomain.py b/tools/python/xen/xend/XendDomain.py index 5c504897aa..3fb066327f 100644 --- a/tools/python/xen/xend/XendDomain.py +++ b/tools/python/xen/xend/XendDomain.py @@ -8,6 +8,7 @@ import errno import os import scheduler +import string import sys import traceback import time @@ -357,9 +358,6 @@ class XendDomain: except Exception, ex: log.exception("Error creating domain info: id=%s", name) - def domain_exists(self, name): - return self.domain_lookup(name) != None - def domain_unpause(self, id): """Unpause domain execution. @@ -514,7 +512,17 @@ class XendDomain: port = xroot.get_xend_relocation_port() sock = relocate.setupRelocation(dst, port) - XendCheckpoint.save(self, sock.fileno(), dominfo) + # temporarily rename domain for localhost migration + if dst == "localhost": + dominfo.name = "tmp-" + dominfo.name + + try: + XendCheckpoint.save(self, sock.fileno(), dominfo) + except: + if dst == "localhost": + dominfo.name = string.replace(dominfo.name, "tmp-", "", 1) + raise + return None def domain_save(self, id, dst, progress=False): -- 2.30.2